bitkeeper revision 1.1271 (42527d4814Ue_cd-FzUT4Dr8TSIJAA)

Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into fleming.research:/scratch/fleming/mafetter/xen.work

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/arch/x86/domain_build.c
index 0e2aaaf58b0968844fb0e245f2a8ef5a41fa9381,ff199626069d5be347627dd8fe75483f2f2a6a37..ac96965446ac284556186e3b9048815d1037362c
--- 1/xen/arch/x86/domain_build.c
--- 2/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@@ -23,14 -23,8 +23,14 @@@
  
  /* opt_dom0_mem: Kilobytes of memory allocated to domain 0. */
  static unsigned int opt_dom0_mem = 0;
- integer_param("dom0_mem", opt_dom0_mem);
+ integer_unit_param("dom0_mem", opt_dom0_mem);
  
 +static unsigned int opt_dom0_shadow = 0;
 +boolean_param("dom0_shadow", opt_dom0_shadow);
 +
 +static unsigned int opt_dom0_translate = 0;
 +boolean_param("dom0_translate", opt_dom0_translate);
 +
  #if defined(__i386__)
  /* No ring-3 access in initial leaf page tables. */
  #define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)